From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 8 Apr 2008 18:37:17 +0000 (+0000)
Subject: Some tweaks
X-Git-Tag: 1.31.0-rc.0~48525
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=3eeccabcccbba67ed4e5c2acf6e1428a2c7ed464;p=lhc%2Fweb%2Fwiklou.git

Some tweaks
---

diff --git a/maintenance/populateParentId.php b/maintenance/populateParentId.php
index 84e99dd882..1dfc2298f9 100644
--- a/maintenance/populateParentId.php
+++ b/maintenance/populateParentId.php
@@ -6,7 +6,7 @@
  * and to find new page edits by users.
  */
 
-define( 'BATCH_SIZE', 100 );
+define( 'BATCH_SIZE', 500 );
 
 require_once 'commandLine.inc';
 	
@@ -24,23 +24,25 @@ function populate_rev_parent_id( $db ) {
 	$end = $db->selectField( 'revision', 'MAX(rev_id)', false, __FUNCTION__ );
 	$blockStart = $start;
 	$blockEnd = $start + BATCH_SIZE - 1;
+	$count = 0;
 	while( $blockEnd <= $end ) {
 		$cond = "rev_id BETWEEN $blockStart AND $blockEnd";
-		$res = $db->select( 'revision', array('rev_id', 'rev_page'), $cond, __FUNCTION__ );
+		$res = $db->select( 'revision', array('rev_id','rev_page'), $cond, __FUNCTION__ );
 		# Go through and update rev_parent_id from these rows.
 		# Assume that the previous revision of the title was
 		# the original previous revision of the title when the
 		# edit was made...
-		while( $row = $db->fetchObject( $res ) ) {
+		foreach( $res as $row ) {
 			$previousID = $db->selectField( 'revision', 'rev_id', 
-				array( 'rev_page' => $row->rev_page, 'rev_id < ' . $row->rev_id ), 
+				array( 'rev_page' => $row->rev_page, "rev_id < '{$row->rev_id}'" ), 
 				__FUNCTION__,
 				array( 'ORDER BY' => 'rev_id DESC' ) );
 			# Update the row...
 			$db->update( 'revision',
 				array( 'rev_parent_id' => intval($previousID) ),
-				array( 'rev_page' => $row->rev_page, 'rev_id' => $row->rev_id ),
+				array( 'rev_id' => $row->rev_id ),
 				__FUNCTION__ );
+			$count++;
 		}
 		$blockStart += BATCH_SIZE;
 		$blockEnd += BATCH_SIZE;
@@ -51,7 +53,7 @@ function populate_rev_parent_id( $db ) {
 		__FUNCTION__,
 		'IGNORE' );
 	if( $logged ) {
-		echo "rev_parent_id population complete\n";
+		echo "rev_parent_id population complete ... {$count} rows\n";
 		return true;
 	} else {
 		echo "Could not insert rev_parent_id population row.\n";